Makefile.in: Minor tweaks to RPM process to do uploads automatically.

maggeo.c: tweak wording on > 200 wpts error.
testo: placate chkdoc

diff --git a/Makefile.in b/Makefile.in
index 197f122c342178ad447a1e8ef46ca22de04e16ea..e7e6b3c5fea88edb68eb30a64c9c02f7ae907524 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,9 +1,9 @@
 VPATH = @srcdir@
 
-VERSU=1_2_8
-VERSD=1.2.8
+VERSU=1_2_9
+VERSD=1.2.9
 # YYYYMMDD, please, if beta.
-RELEASE=-beta20060701a
+# RELEASE=-beta20060701a
 VERSIONU=$(VERSU)$(RELEASE)
 VERSIOND=$(VERSD)$(RELEASE)
 DOCVERSION=development
@@ -214,20 +214,18 @@ release-winbuild:
          zip -j /tmp/gpsbabel-$(VERSIOND).zip $(WINFILES)
        rm -fr /tmp/gpsbabel-$(VERSIOND)-cross
 
-release-upload:
+release-upload:  /tmp/gpsbabel-$(VERSIOND).tar.gz  /tmp/gpsbabel-$(VERSIOND).zip /tmp/dist/SRPMS/gpsbabel-$(VERSIOND)-0.src.rpm  /tmp/dist/RPMS/i386/gpsbabel-$(VERSIOND)-0.i386.rpm
        @(. tools/functions && ask "Type yes if you want to do the upload now" "yes" )
        curl -u anonymous:anonymous --upload-file /tmp/gpsbabel-$(VERSIOND).tar.gz ftp://upload.sf.net/incoming/
        curl -u anonymous:anonymous --upload-file /tmp/gpsbabel-$(VERSIOND).zip ftp://upload.sf.net/incoming/
+       curl -u anonymous:anonymous --upload-file /tmp/dist/SRPMS/gpsbabel-$(VERSIOND)-0.src.rpm  ftp://upload.sf.net/incoming/ 
+       curl -u anonymous:anonymous --upload-file /tmp/dist/RPMS/i386/gpsbabel-$(VERSIOND)-0.i386.rpm  ftp://upload.sf.net/incoming/ 
 
-release: release-sourcecheck  release-tarball release-winbuild release-upload
+release: release-sourcecheck  release-tarball release-winbuild release-rpm release-upload
 
 rpm: clean
        tools/mkrpm $(VERSD) $(RELEASE)
 
-rpmrelease:
-       curl -u anonymous:anonymous --upload-file /usr/src/redhat/SRPMS/gpsbabel-$(VERSIOND).src.rpm  ftp://upload.sf.net/incoming/ 
-       curl -u anonymous:anonymous --upload-file /usr/src/redhat/RPMS/i386/gpsbabel-$(VERSIOND).i386.rpm  ftp://upload.sf.net/incoming/ 
-
 mac-release:
        mkdir -p usr/bin usr/share/gpsbabel/doc
        cp gpsbabel usr/bin/

diff --git a/maggeo.c b/maggeo.c
index 21263e330658f0da2cc8f3200ed9e047bcf16144..d1d9089b4fdd753e70fa44485cc5f5caea6b4ce2 100644 (file)
--- a/maggeo.c
+++ b/maggeo.c
@@ -56,7 +56,7 @@ static void
 maggeo_wr_init(const char *fname)
 {
        if (waypt_count() >= 200) {
-               fatal(MYNAME ": Magellan firmware does not support more than 200 waypoints in one .gs file.\n");
+               fatal(MYNAME ": eXplorist does not support more than 200 waypoints in one .gs file.\nDecrease the number of waypoints sent.\n");
        }
        maggeofile_out = xfopen(fname, "wb", MYNAME);
        desc_handle = mkshort_new_handle();

diff --git a/testo b/testo
index 7020e0005b53a39eb1dfd9106d22c01fd83edda4..8d43ce72ad829516858158628d4892777ab57ac4 100755 (executable)
--- a/testo
+++ b/testo
@@ -51,6 +51,9 @@ sort_and_compare()
 # geonet
 # saplus
 # s_and_t
+# xmap2006
+# cambridge
+# cup
        
 # Geocaching .loc
 rm -f ${TMPDIR}/gl.loc